From 4f9d67bce04e2a7e74fd0eb8cf080e13a903dca0 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 21 Jul 2014 22:21:16 -0700 Subject: [PATCH] Fix windows tests --- src/cargo/ops/cargo_rustc/mod.rs | 2 +- tests/test_cargo_test.rs | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/cargo/ops/cargo_rustc/mod.rs b/src/cargo/ops/cargo_rustc/mod.rs index 8cd128201..9355f431a 100644 --- a/src/cargo/ops/cargo_rustc/mod.rs +++ b/src/cargo/ops/cargo_rustc/mod.rs @@ -3,7 +3,7 @@ use std::collections::HashSet; use core::{Package, PackageId, PackageSet, Target, Resolve}; use util; -use util::{CargoResult, ProcessBuilder, CargoError, ChainError, human, caused_human}; +use util::{CargoResult, ProcessBuilder, CargoError, human, caused_human}; use util::{Config, Freshness, internal, ChainError}; use self::job::Job; diff --git a/tests/test_cargo_test.rs b/tests/test_cargo_test.rs index ff9bdfe9d..5269706a8 100644 --- a/tests/test_cargo_test.rs +++ b/tests/test_cargo_test.rs @@ -1,3 +1,4 @@ +use std::path; use std::str; use support::{project, execs, basic_bin_manifest, basic_lib_manifest}; @@ -73,11 +74,12 @@ test!(cargo_test_failing_test { ---- test_hello stdout ----\n\ task 'test_hello' failed at 'assertion failed: \ `(left == right) && (right == left)` (left: \ - `hello`, right: `nope`)', src/foo.rs:12\n\n\n\n\ + `hello`, right: `nope`)', src{sep}foo.rs:12\n\n\n\n\ failures:\n test_hello\n\n\ test result: FAILED. 0 passed; 1 failed; \ 0 ignored; 0 measured\n\n", - COMPILING, p.root().display()))); + COMPILING, p.root().display(), + sep = path::SEP))); assert_that(&p.bin("test/foo"), existing_file()); }) -- 2.30.2